Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: add spacing between comment and Uploading attachment... #42516

Merged
merged 8 commits into from
Jun 12, 2024

Conversation

dragnoir
Copy link
Contributor

@dragnoir dragnoir commented May 23, 2024

Details

This PR adds spacing between text comments and "Uploading attachment..." when uploading an attachment with a text.

Fixed Issues

$ #42297
PROPOSAL: #42297 (comment)

Tests

  1. Open any report
  2. Send a image with text
  3. Verify that "Uploading attachment..." has a margin under the text.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Open any report
  2. Send a image with text
  3. Verify that "Uploading attachment..." has a margin under the text.
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native

image

Android: mWeb Chrome

image

iOS: Native

image

iOS: mWeb Safari

image

MacOS: Chrome / Safari

image

MacOS: Desktop

image

@dragnoir dragnoir marked this pull request as ready for review May 23, 2024 11:55
@dragnoir dragnoir requested a review from a team as a code owner May 23, 2024 11:55
@melvin-bot melvin-bot bot requested review from thesahindia and removed request for a team May 23, 2024 11:55
Copy link

melvin-bot bot commented May 23, 2024

@thesahindia Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@dragnoir
Copy link
Contributor Author

@shawnborton you may want to check the spacing here

image

@shawnborton
Copy link
Contributor

Can you share a side-by-side of your changes as well as a series of two messages in a row? Ideally the spacing should be identical, so it would look more like this:
CleanShot 2024-05-23 at 15 45 17@2x

@dragnoir
Copy link
Contributor Author

here, two screens side by side:

image

image

@shawnborton
Copy link
Contributor

Looks like it's not the same gap as the gap between messages:
CleanShot 2024-05-23 at 16 16 26@2x

Can you adjust this to match that gap please? Thanks!

@dragnoir
Copy link
Contributor Author

Fixed

image

@shawnborton
Copy link
Contributor

Wonderful, that looks good to me - thanks Rachid!

@thesahindia
Copy link
Member

thesahindia commented May 27, 2024

Fixed

image

Are you using styles.mt5 in the screenshot? The gap isn't the same as in the manual message when using styles.mt4

styles.mt4 -

Screenshot 2024-05-28 at 12 04 42 AM

styles.mt5 -
Screenshot 2024-05-28 at 12 06 23 AM

@dragnoir
Copy link
Contributor Author

Are you using styles.mt5 in the screenshot? The gap isn't the same as in the manual message when using styles.mt4

I am using mt4

image

@dragnoir
Copy link
Contributor Author

I will check again..

@dragnoir
Copy link
Contributor Author

I checked again and I think mt4 is the right value

image

image

image

@thesahindia
Copy link
Member

@dragnoir, the message doesn't have the same gap on the native app

Screenshot 2024-05-29 at 2 12 08 PM

@dragnoir
Copy link
Contributor Author

Fixed

image

image

@thesahindia
Copy link
Member

@Julesssss, can you please generate the test builds here?

@Julesssss
Copy link
Contributor

@thesahindia it looks like we might have a build issue on mobile, but lets see what happens 🤞

Copy link
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/42516/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/42516/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/42516/NewExpensify.dmg https://42516.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@thesahindia
Copy link
Member

@thesahindia it looks like we might have a build issue on mobile, but lets see what happens 🤞

Thank you for providing the test build!

@thesahindia
Copy link
Member

thesahindia commented May 30, 2024

The gap isn't the same as in the manual message when using styles.mt4

styles.mt4 -
Screenshot 2024-05-28 at 12 04 42 AM
styles.mt5 -
Screenshot 2024-05-28 at 12 06 23 AM

I got the same results as earlier on the test build. The difference is minor but can be fixed by using styles.mt5. @shawnborton, could you please test the build to confirm?

@dragnoir dragnoir changed the title Fix; add spacing between comment and Uploading attachment... Fix: add spacing between comment and Uploading attachment... Jun 1, 2024
@thesahindia
Copy link
Member

Friendly bump @shawnborton ^

@shawnborton
Copy link
Contributor

Hmm each message is wrapped with 8px of vertical padding, so two consecutive messages should give us a gap of 16px no?

CleanShot 2024-06-04 at 15 20 25@2x

CleanShot 2024-06-04 at 15 19 42@2x

@thesahindia
Copy link
Member

Hmm each message is wrapped with 8px of vertical padding, so two consecutive messages should give us a gap of 16px no?

Ok now I understand why I was getting different values. I was using a message with a blank line in the middle to create the gap, for which the gap is 21px. I thought that’s what we are trying to match.

Screenshot 2024-06-06 at 6 22 39 PM

Sorry for the misunderstanding.

@thesahindia
Copy link
Member

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native Screenshot 2024-05-30 at 2 28 45 AM
Android: mWeb Chrome Screenshot 2024-05-30 at 2 33 02 AM
iOS: Native Screenshot 2024-05-30 at 3 45 11 AM
iOS: mWeb Safari Screenshot 2024-05-30 at 3 47 08 AM
MacOS: Chrome / Safari Screenshot 2024-06-06 at 6 30 38 PM
MacOS: Desktop Screenshot 2024-05-29 at 1 34 08 PM

Copy link
Member

@thesahindia thesahindia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@melvin-bot melvin-bot bot requested a review from grgia June 6, 2024 13:03
@shawnborton
Copy link
Contributor

Woo, all you @grgia !

@grgia grgia requested a review from a team June 12, 2024 14:14
@grgia grgia merged commit c02e32a into Expensify:main Jun 12, 2024
16 checks passed
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.83-3 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants